From 5ebb713df5bea611c4e862b69c9f1d5cd6df3a75 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 Nov 2015 14:26:50 -0500 Subject: [PATCH] HighContrast: Update combobox styling Adapt to the changes in the previous commit. --- gtk/theme/HighContrast/_common.scss | 31 +++++++++++--------- gtk/theme/HighContrast/gtk.css | 44 +++++++++++++---------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 12c4512f9e..1e31b8c134 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -742,7 +742,7 @@ spinbutton { /************** * ComboBoxes * **************/ -GtkComboBox { +combobox { //FIXME padding issue padding: 0; @@ -790,31 +790,34 @@ GtkComboBox { } } -.linked > GtkComboBox > button { +.linked > combobox > button { // The combo is a composite widget so the way we do // button linking doesn't work, special case needed. // See https://bugzilla.gnome.org/show_bug.cgi?id=733979 &:dir(ltr) { @extend %linked_middle; } // specificity bump &:dir(rtl) { @extend %linked_middle:dir(rtl); } } -.linked > GtkComboBox:first-child > button { +.linked > combobox:first-child > button { @extend %linked:first-child; } -.linked > GtkComboBox:last-child > button { +.linked > combobox:last-child > button { @extend %linked:last-child; } -.linked > GtkComboBox:only-child > button { +.linked > combobox:only-child > button { @extend %linked:only-child; } - -.linked.vertical > GtkComboBoxText > button, -.linked.vertical > GtkComboBox > button { @extend %linked_vertical_middle; } -.linked.vertical > GtkComboBoxText:first-child > button, -.linked.vertical > GtkComboBox:first-child > button { @extend %linked_vertical:first-child; } -.linked.vertical > GtkComboBoxText:last-child > button, -.linked.vertical > GtkComboBox:last-child > button { @extend %linked_vertical:last-child; } -.linked.vertical > GtkComboBoxText:only-child > button, -.linked.vertical > GtkComboBox:only-child > button { @extend %linked_vertical:only-child; } +.linked.vertical > combobox > button { + @extend %linked_vertical_middle; +} +.linked.vertical > combobox:first-child > button { + @extend %linked_vertical:first-child; +} +.linked.vertical > combobox:last-child > button { + @extend %linked_vertical:last-child; +} +.linked.vertical > combobox:only-child > button { + @extend %linked_vertical:only-child; +} /************ * Toolbars * diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css index 26c21bc31f..83f27eda5e 100644 --- a/gtk/theme/HighContrast/gtk.css +++ b/gtk/theme/HighContrast/gtk.css @@ -710,40 +710,36 @@ toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolb .sidebar-item.needs-attention > label:dir(rtl) { background-position: left 3px, left 4px; } -.osd button, .osd button:hover, .osd button:active, .osd button:checked, .osd button:insensitive, .osd button:backdrop, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked > GtkComboBox > button:dir(ltr) { +.osd button, .osd button:hover, .osd button:active, .osd button:checked, .osd button:insensitive, .osd button:backdrop, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, .linked > combobox > button:dir(ltr) { border-radius: 0; border-left-style: none; } - .osd button:dir(rtl), .inline-toolbar button:dir(rtl), .linked > button:dir(rtl), .linked > GtkComboBox > button:dir(rtl) { + .osd button:dir(rtl), .inline-toolbar button:dir(rtl), .linked > button:dir(rtl), .linked > combobox > button:dir(rtl) { border-radius: 0; border-right-style: none; border-left-style: solid; } -.osd button:first-child, .inline-toolbar button:first-child, .linked > button:first-child, .linked > GtkComboBox:first-child > button { +.osd button:first-child, .inline-toolbar button:first-child, .linked > button:first-child, .linked > combobox:first-child > button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd button:last-child, .inline-toolbar button:last-child, .linked > button:last-child, .linked > GtkComboBox:last-child > button { +.osd button:last-child, .inline-toolbar button:last-child, .linked > button:last-child, .linked > combobox:last-child > button { border-radius: 0 3px 3px 0; } - .osd button:last-child:dir(rtl), .inline-toolbar button:last-child:dir(rtl), .linked > button:last-child:dir(rtl), .linked > GtkComboBox:last-child > button:dir(rtl) { + .osd button:last-child:dir(rtl), .inline-toolbar button:last-child:dir(rtl), .linked > button:last-child:dir(rtl), .linked > combobox:last-child > button:dir(rtl) { border-right-style: solid; } -.osd button:only-child, .inline-toolbar button:only-child, .linked > button:only-child, .linked > GtkComboBox:only-child > button { +.osd button:only-child, .inline-toolbar button:only-child, .linked > button:only-child, .linked > combobox:only-child > button { border-radius: 3px; border-style: solid; } -.linked.vertical entry, .linked.vertical spinbutton, .linked.vertical entry:focus, .linked.vertical spinbutton:focus, .linked.vertical entry:insensitive, .linked.vertical spinbutton:insensitive, .linked.vertical entry:insensitive:backdrop, .linked.vertical spinbutton:insensitive:backdrop, .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > GtkComboBoxText > button, -.linked.vertical > GtkComboBox > button { +.linked.vertical entry, .linked.vertical spinbutton, .linked.vertical entry:focus, .linked.vertical spinbutton:focus, .linked.vertical entry:insensitive, .linked.vertical spinbutton:insensitive, .linked.vertical entry:insensitive:backdrop, .linked.vertical spinbutton:insensitive:backdrop, .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button { border-left-style: solid; border-top-style: none; border-radius: 0; } -.linked.vertical entry:first-child, .linked.vertical spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > GtkComboBoxText:first-child > button, -.linked.vertical > GtkComboBox:first-child > button { +.linked.vertical entry:first-child, .linked.vertical spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button { border-style: solid; border-radius: 3px 3px 0 0; } -.linked.vertical entry:last-child, .linked.vertical spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > GtkComboBoxText:last-child > button, -.linked.vertical > GtkComboBox:last-child > button { +.linked.vertical entry:last-child, .linked.vertical spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button { border-radius: 0 0 3px 3px; } -.linked.vertical entry:only-child, .linked.vertical spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > GtkComboBoxText:only-child > button, -.linked.vertical > GtkComboBox:only-child > button { +.linked.vertical entry:only-child, .linked.vertical spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button { border-radius: 3px; border-style: solid; } @@ -947,35 +943,35 @@ spinbutton { /************** * ComboBoxes * **************/ -GtkComboBox { +combobox { padding: 0; -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; box-shadow: 0 1px #fff; text-shadow: 0 1px white; icon-shadow: 0 1px white; } - GtkComboBox:insensitive { + combobox:insensitive { color: gray; text-shadow: none; icon-shadow: none; } - GtkComboBox:backdrop { + combobox:backdrop { color: #000; text-shadow: none; icon-shadow: none; } - GtkComboBox:backdrop:insensitive { + combobox:backdrop:insensitive { color: gray; } - GtkComboBox .menuitem { + combobox .menuitem { text-shadow: none; } - GtkComboBox separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view separator.vertical, GtkPlacesSidebar.sidebar .view GtkComboBox separator.vertical { + combobox separator.vertical, combobox GtkPlacesSidebar.sidebar .view separator.vertical, GtkPlacesSidebar.sidebar .view combobox separator.vertical { -GtkWidget-wide-separators: true; } - GtkComboBox.combobox-entry entry { + combobox.combobox-entry entry { border-radius: 3px 0 0 3px; } - GtkComboBox.combobox-entry entry:dir(rtl) { + combobox.combobox-entry entry:dir(rtl) { border-radius: 0 3px 3px 0; } - GtkComboBox.combobox-entry button, GtkComboBox.combobox-entry button:backdrop { + combobox.combobox-entry button, combobox.combobox-entry button:backdrop { border-radius: 0 3px 3px 0; border-left-style: none; } - GtkComboBox.combobox-entry button:dir(rtl), GtkComboBox.combobox-entry button:backdrop:dir(rtl) { + combobox.combobox-entry button:dir(rtl), combobox.combobox-entry button:backdrop:dir(rtl) { border-radius: 3px 0 0 3px; border-left-style: solid; border-right-style: none; } -- 2.30.2